Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 3 Feb 2012 20:37:10 +0000 (12:37 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 3 Feb 2012 20:37:10 +0000 (12:37 -0800)

Trivial merge